Skip to content

Fix the ammo panel's empty mag font and round size - #2269

Merged
sunzenshen merged 2 commits into
NeotokyoRebuild:masterfrom
KyleWerle:basic-hud-empty-mag-font
Oct 29, 2026
Merged

sunzenshen merged 2 commits into
NeotokyoRebuild:masterfrom
KyleWerle:basic-hud-empty-mag-font

Conversation

@KyleWerle

@KyleWerle KyleWerle commented Oct 28, 2026 •

Copy link
Copy Markdown
Contributor

Description

Two fixes for the ammo panel from #2265.

  • With an empty mag the spent rounds drew bigger. They were only getting the bullet font through the filled rounds, so at 0 they used the fire mode font. The font is now set before both.
  • The ZR, MX and M41 round lost the little rim on its right side at 1080p and 900p. At those sizes Windows cuts the right rim off NOCR's c. NHudBullets 21 -> 23 keeps both rims at 900p, 1080p and 1440p, and puts the rounds back near their old size. 720p to 800p still lose it on the left side.

Toolchain

  • Windows MSVC VS2022
  • Linux: GCC syntax pass on neo_hud_ammo.cpp only, not built or run

Linked Issues

With an empty mag the filled pass is skipped, so the spent rounds drew in
whatever font was set last. Since NeotokyoRebuild#2265 that's the fire mode font (NOCR 25
against the bullets' 21), so the rounds grew when the mag ran dry.
At tall 21 the 1080p and 900p rounds come out 47 and 39 px, and at those sizes
Windows' antialiased glyph cuts the right rim off NOCR's c (the ZR, M41, MX
round). 23 gives 51, 43 and 69 px at 1080p, 900p and 1440p: both wings, and
close to the old bands (50, 44, 68).
@sunmachine

sunmachine commented Oct 28, 2026 •

Copy link
Copy Markdown
Contributor

Control (ZRM)

before-1080p after-1080p

Test (MX)

03 02 01

@sunmachine
sunmachine requested review from a team and sunmachine October 28, 2026 04:35
Comment thread game/neo/resource/ClientScheme.res
Comment thread src/game/client/neo/ui/neo_hud_ammo.cpp

@sunmachine sunmachine left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. Tested ingame at 1080p, 720p, 1440p. See comment below for some of the test screenshots.

@sunmachine
sunmachine requested a review from a team October 28, 2026 04:41
@KyleWerle
KyleWerle marked this pull request as ready for review October 28, 2026 16:55
@sunzenshen
sunzenshen merged commit d8bdd9f into NeotokyoRebuild:master Oct 29, 2026
8 of 13 checks passed
@sunzenshen sunzenshen added the UI/HUD Relates to the HUD, NeoUI, menus, etc label Oct 29, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

UI/HUD Relates to the HUD, NeoUI, menus, etc

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants